Revert "remove legacy devices"

This reverts commit 11babd3191b0b8bd2b7d568fa91fe962554c16d2.

Change-Id: Iad7869f5d9839932fd3eedeb656cc068f55ad1c6
Needed for proper add/remove handling