This part of the code has been quite fragile, and I'm wondering if we should have added tests to ensure the correct behavior before merging it.

Since this is just removing I'm less concerned about that. We can manually test on dev before release.

My concern is more about future changes and making sure our future selves remember what the correct behavior should be.

I'm being extra cautious here because we've already introduced a good number of bugs in this component with just simple changes.