After freeze transformation, it's always troublesome to restore the rotation of an object;
there are many ways you could snap rotation pivot in Maya,
but I found it's not as easy when you want to deal with cylinder or ball shape,
here is a tool (button) that makes the modeller and rigger's life easier.