This is as discussed with @shykes on IRC Upstream-commit: d7897508516c05e7ffea5b96053ec80c7771d777 Component: engine