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