Revert bdcfdc23 since it did not work (though it had appeared to locally).