Revert to general rotation detection

Reverted previous changes, but re-added the "default to normal rotation" behaviour in a new place.