This way we don't get any issues with leftovers Upstream-commit: d951911b23b26cda087e823f203414a0ad184276 Component: engine