We've packaged up so much - the engine based approach should be very close to workable at this point. Just need to take time to work through it I think - handling details like updating test data.

This would let us revert #988