Fix an accidental revert of a fix