Adjusted slightly so this will work with mt engine.
Authored by: tswift 2016-12-30
Parent: [r8935]
Child: [r8937]
