Merge "Fix a T -> T restore issue"