This reverts commit 593797ab9b. I didn't realize that there was already a fix for the broken tests fd2254b735.
593797ab9b
fd2254b735