This reverts commit 13e66422. Reason for revert: Broke the build. Change-Id: I0f95cf407bfc47d116ee9c70415e3eed174eb20f