engine: Partial revert of 20d4297bf8d85505f9ed9b4aabcce13a6e5e1f90

Reverted part of 20d4297bf8d85505f9ed9b4aabcce13a6e5e1f90 which was
pushed by mistake.

Change-Id: Ia6dd6683058e5ebc106fe63e54ffbbc6417c461c
Signed-off-by: Allon Mureinik <amureini@redhat.com>