5b96078624
This reverts commit eb031c6ff1d416d90d7c89dbeb367f9dc1927564. The change is breaking targets in g3 see cl/194336387.