This reverts commit 1a41d4be. Reason for revert: Breaks build Change-Id: Iffa662def22573100120d47a259b07bd841a0f00