Merge fix. Revert changes for orientation....