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

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