Revert "initial 4.2 multi-device work"

This reverts commit 0353c595448a9acffcb0abc53b6b60562e0a1802.