This reverts commit 27143f2929. It causes some downstream failures when bootstrapping builds.
27143f2929