Revert "Changes for new DisplayOrientation compatibility"

This reverts commit 3430788cfe0f705a855360e6cfe61da3bcaeecc9.
Trying again