Finish up the cobe 3.x revert

This stuff will remain available on the cobe-3x branch for now.