This breaks build so we're reverting for now

Revert "Assign specific types to block devices."

This reverts commit 461b9258d4a6e0c7498260a0dce0b7718a1137f8.