This reverts commit 74ec7d8343. Reason for revert: Tests are still failing Change-Id: Ic7dcd5fb4703cfe476f74835782b99d5848ed738
74ec7d8343