This reverts commit c94cf97b since it appears to have broken linaro-clang-armv7-quick build bot and needs further investigation.