This reverts commit ec5f77a0. Reason for revert: Change broke the build Change-Id: Id1a6d35b91e4f547a809d2d222e3f33d51bab990