Revert "b2" bao

This reverts commit 32dc919bda0e3ab185880751c9c68faf1a0844b2.