2.7.4 patching helper/cruft