This reverts commit b6d6a54f, which fixed #3072, so we'll have to figure out another way to make that work.