Revert to autodetection - removed default value of null for deviceType