Yeah, I wasn't excited that this is on the `delete` method but the index call is a signal on save. But we may want to be able to disable this on Marketplace if we find bugs and aren't ready to switch over, and we'd need a waffle flag for that.