WARNING! When this is uplifted to 1.4, we'll need to add delete and cancel, or uplift the delete dialog patch at the same time.  If we just uplift this patch as it is, it will be broken.