This is a follow-up on PR 11708, as suggested by tianon. Signed-off-by: Harald Albers <github@albersweb.de> Upstream-commit: a09cc935c3531e0132640f0fe258041f1b445fdc Component: engine