Revert "Fix glitch when user change orientation"

This reverts commit 5728e93e91359d4e2e2865e154c07c69b9bb5c97.