Temporary fix for rotation (See #11720)