undo 5f45cd12e68e4aeb7218cd7e98642c9a00f8c37a
attempt to handle orientation changes better...v2