In stead of tagging volumes at attachment-time, always do the tagging, so accidentally untagged volumes get retagged.