Revert "CB 2.20"

This reverts commit a6a1f09d41e720fedb41db9769138f778cfcbd61.