Fix error removing diff path Upstream-commit: bbcdc7df34eeb01c2f5741235f26f90749e67a05 Component: engine