This reverts commit 2ba016cd. This is causing a failure on the clang-cmake-armv7-full bot, and there are outstanding review comments.