Revert "Hardware rev2b submitted for manufacturing. Minor touchups."

This reverts commit 36869597a9b8037c6faeafee65226f57530de30c.