Fix orientation; Keep light sensor -- Reverts parts of prior commit