This reverts commit eb05c2a6. Reason for revert: Yet another broken build. Change-Id: I4198f2dd5c7848365d71d03f6dbd598998fb9bd8