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