Reverted r223114, it caused failure on on clang-native-arm-cortex-a9.