Revert "comment out generic devices"

This reverts commit 2685d1ca39e55527d27ea1d939d4813264639cfd.