Use a simplier device scan.

The change was made on mpi@ advice,