Merge "Revert "Use correct register class for refs""