This reverts commit 32837730. This commit causes buildbot failures due to some clang tests are not updated. Temporary revert to fix clang tests.