This reverts commit 30e8f83c. Causes huge compile time regressions on certain large files. Will followup offline with author.