revert r76602, 76603, and r76615, pending design discussions.