This reverts commit ac2b530f4b6b273eb0cf96753302f07d62ce6c0c. The change is breaking targets in g3 see cl/194336387.
@stable