Revert "Fixed rotation crashes"

This reverts commit 00637844169b373bf07bf14033142b3cb581c4cd.