Fix: removing dirty hack for engines that may result in unstable behaviour

Signed-off-by: NicoArbogast <nicolas.arbogast@gmail.com>