Re #1400 Restoring the auto-generated tag's original state.