Created by: chuckatkins
This reverts commit 46c03643, reversing changes made to f8bfbfd4.
Inline engine currently breaks install so we're reverting it until outstanding issues are resolved