Revert one minor change in latest patch as already implemented in a SUBST routine (thus making it fail).