This reverts commit c569b7524974200040c2abae6923cd4e6f59a13b. As it was synched together with 5a9ed2de272912ac74ed56bfec4bdf4551f7b38e which broke an internal test.
This reverts commit c569b7524974200040c2abae6923cd4e6f59a13b. As it was synched together with 5a9ed2de272912ac74ed56bfec4bdf4551f7b38e which broke an internal test.