Using the latter resulted in receiving extra OnDelete event callbacks. Using
DeleteDropWatch removed the flake.

Fixes #14138.