This reverts commit 105bc63295a7126798d3722a0e205c5ead4e2b1c, which (although correct), resulted in a backward incompatible change. We can re-implement this in future, after this changes goes through a deprecation cycle Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: c67550414b762ab32ea3e9645ebcafb79cb9059d Component: engine