This has left the build broken since it was submitted. This reverts commit 31fd543e. Change-Id: I220db7ba8418d7063b958f84a34e2accd0e3e278