Grand Schemozzle, 4.4 backport