Revert "Workaround for remove stuck (issue 11080792)"

This reverts commit f72693d907c67a539cdb6643f157fc0ba28c4268.
1 file changed