Remove unnecessary path parts Upstream-commit: f5b458b1dc898862609ad5aadea7321cbec582c6 Component: engine