This reverts commit 0a532207. This breaks several of our tests. Have given reproducers to author. Reverting this until author can fix the issue.