Make TrackRefs removal more robust when facing the reality of the Grid
This tag has no release notes.