Revert "Squashed revert of temp removal of CM 11 engine"

This reverts commit 094a7781f4b3da9aec8cd240e0fca05f16956ede.