Apparently that didn't work, so reverting 287dd6ae7dc7e41138791c4eece19bfa47144c84.