Revert "remove devices"

This reverts commit f36b646405bb2a818c36910937cbf96d0aef2da6.