Revert 075b141..f04eb75

This rolls back to commit 075b14163fef6da535da497c7e4d4a796029b439.
Rotation Optimization update