This breaks when built with clang This reverts commit 4a2bdd80. Change-Id: I2f89a9c19de91d4c46dce110e36a32551134e5d5