Revert to t2b/b2t for binary encoding pending further opt work