Update/save callbacks should not be called at all during a destroy call, as would happen with the code from that PR.
