This reverts commit 43a38a65, and follow-up 5a7bc5e2. The commit breaks check-clang-tools, the test added in the change does not pass.