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