This reverts commit f9ccdf21. Reason for revert: breaks build on some branch. Change-Id: I1cc187fa44bfe44ab3560e635d8ec7e6971ee2dc