This reverts commit f945fb6b. Reason for revert: haven't fixed all the builds yet Change-Id: I55aff5d0290c27691427d91a8e46ae01c87da6b2