This reverts commit a8fe1206. It causes a crash when building gzip. Will post the detailed reduced test case to D81267.