Revert "Merge changes If65b4e6c,If993b7f7"

Broke the build.

This reverts commit 615357b952a10305787b5268878eed48cb0bd8a7, reversing
changes made to ec4c4548dd2c02242b965162372e7bb4c6d03345.

Change-Id: I00e55e60783cffa9ca8b5a66ba342454e4834b18
20 files changed