Work-around (not really a fix) by keeping local 'require' (bug 1036381)
Merge pull request #2308 from dethe/fix_missing_require

Work-around (not really a fix) by keeping local 'require' (bug 1036381)