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

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