Partially revert 1606f1b