0a8fab01da
This reverts commit eec7a9d90f.
Reason for revert: Failing tests.
Change-Id: Idf16453bbd7f0ace17d8e80d3303fae26b50333b