Pending further fixes, Revert "Fixed a few issues affecting insets and offsets in orientations other than portrait.", which breaks portrait

This reverts commit 5518a74a0688a071a2d7defec3c0f56da893bfb2.