Revert "Fix DeviceSettings"

This reverts commit 60b3c62333e5eeebe388ecea31ce9f43683d113f.