engine: Revert parts of 34a62959369617e6191ca71c3ec73f93e002e957

This should have never got to the patchset. Probably a rebase
leftover...

Change-Id: I6f1bdb083e4fde3025dff6f79b9145a257338c37
Signed-off-by: Martin Sivak <msivak@redhat.com>