Rotation & Flip Reset should not include orientation...

I'm shooting straight down, with my orientation set to 180*. Occasionally I rotate a few degrees more to set the product straight in the image. If I move on and shoot something else, I want to be able to click the reset button the the Rotation & Flip box without resetting the orientation. 

I can click in the box and set the Angle to 0*, but this is inelegant. 

Honestly, this feels like a bug, because, if I do accidentally reset the orientation and then re-rotate the image, the crop follows the reset, but not the fix, so...?