Also revert all dependent changes:
This reverts commit 8e18668d14.
This reverts commit 69b4587bfb.
This reverts commit a9c9a4baf2.
This reverts commit 2c0042b666.
This reverts commit f6c8206735.
This reverts commit 24855c0917.
Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8