This reverts commit b05737d78f. Because it broke clang-based builds. Change-Id: Icc97d325adacfc58198b082538f3db2d02ba9a90
b05737d78f