Revert "updates to fix build"

This reverts commit 590930a5d26dfc569ec226de912927298aa47851.

messed up little
Revert "build: recovery: Support adding device-specific items"

This reverts commit 81d43fcdb0dd467bf2b7d6c3be442d7cf7922a5d.