Merge "Preserve attributes on rollback."