This reverts commit 3c63298acd. Christopher and I had the same idea at the same moment, no need for two fixes!
3c63298acd