Merge "Revert "Workaround for remove stuck (issue 11080792)"" into jb-ub-now-jolly-elf