This reverts commit 6c63a59425. This causes massive slowdowns: looks like we accidentally have some source-depndent
6c63a59425