This reverts commit b83e16dbdd.
Found regressions like auto orientation didn't work anymore after this change, revert it
This reverts commit b83e16dbdd.
Found regressions like auto orientation didn't work anymore after this change, revert it