Partially revert #ad7211a