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