am c85a63c5: am 1beeb0aa: Merge "Revert "Workaround for remove stuck (issue 11080792)"" into jb-ub-now-jolly-elf

* commit 'c85a63c58f7b9a63e62ad58f5e70f80adad4736d':
  Revert "Workaround for remove stuck (issue 11080792)"