This reverts commit b4be0928. Reason for revert: break build Change-Id: I11fc5eb5f635a5d99eba962f5817851629e50ab2