Revert "remove unused devices"

This reverts commit 092b50a8bbfbf6ccd6bb1dda33d2192b3317ade5.