Merge "Don't double wrap rollback links"