1d69f35f27
This reverts commit 383c2d1bff.
It seems this commit causes problems with bootstraping, so it'll be
investigated and refined later