Revert "Dev B design"

This reverts commit ea330768b6ce0b4de0b2b34d0d6004b9908b1c91.