Revert "Cleanup bb order."

This reverts commit cdd35368d9c571285fa7683c236869558e8dc5cc.