Comment: add some lines back Upstream-commit: 9273c53d83f7413c160608a759d16e33e7061ab8 Component: engine