This reverts commit 858392f88a1221afa29e6b08b283d5472be69b62. A similar, cleaner fix was already in place.