Revert "Sync CBL"

This reverts commit 523b5ab2fa6c46b66d3e3d4ac5d68e618efcc796.