Revert "Fixed up first draft engine"

This reverts commit 8fe4223c8ada98dcf1a266eddc1ea0b691bf4a6e.