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

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