6ad1c47df8
This increases the chances that the clean-up will take place _after_ the SW has been registered. PR Close #28290