This reverts commit 0ad41cf3f4. Reason for revert: Breaks many tests, see b/109745952#comment18 b/109745952#comment20 and b/79838856#comment19 amongst others Change-Id: I92db38d47cd1dcd7841091e37e3b65dce9456cdf
0ad41cf3f4