Temporary revert to fix the build.

Change-Id: I40454606e3d974bd6fc79b46f663061549a1a790
8 files changed