This reverts commit 04bfd93569. Reason for revert: Fix regressions Change-Id: I7d883e1c3cbd27bb64b581ec800243ad7dfe24fd
04bfd93569