Merge "Clean up some rotation utility methods"