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