This reverts commit cd8e84f46511462fdc7ae8ffee2c9c1f7971fba3. Can't tell why, but it seems to have broken some web tests.