Revert "DEVICE_RESOLUTION Fix"

This reverts commit 241f9741815cfd9f9edac84c08618d29f1f01425.