diff --git a/modules/contrib/cbb/cbb.module b/modules/contrib/cbb/cbb.module
index 74a57efe1..f1b9ec9d1 100644
--- a/modules/contrib/cbb/cbb.module
+++ b/modules/contrib/cbb/cbb.module
@@ -11,6 +11,7 @@
 use Drupal\block\Entity\Block;
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Block\BlockPluginInterface;
 
 /**
  * Implements hook_permission().
@@ -27,19 +28,12 @@ function cbb_permission() {
 /**
  * Implements hook_block_view_alter().
  */
-function cbb_block_view_alter(array &$build, \Drupal\Core\Block\BlockPluginInterface $block) {
+function cbb_block_view_alter(array &$build, BlockPluginInterface $block) {
 	// Get the complete block
 	/** @var \Drupal\block\Entity\Block $bl */
-	$bl = $build['#block'];
-	$cbb_settings = $bl->getThirdPartySettings( 'cbb');
-	if ( $bl->getThirdPartySetting( 'cbb', 'cbb_use', FALSE ) ) {
+	if ( $build['#block']->getThirdPartySetting( 'cbb', 'cbb_use', FALSE ) ) {
 		// https://www.drupal.org/project/drupal/issues/2626224
 		$build['#pre_render'][] = '_cbb_block_view_alter_pre_render';
-
-		// TODO fix this: we have to copy over this third party settings from $bl into $build.
-		$build['#cbb']['cbb_use'] = $bl->getThirdPartySetting( 'cbb', 'cbb_use');
-		$build['#cbb']['cbb_expose_after'] = $bl->getThirdPartySetting( 'cbb', 'cbb_expose_after', '5 minutes');
-		$build['#cbb']['cbb_use_colorbox'] = $bl->getThirdPartySetting( 'cbb', 'cbb_use_colorbox', false);
 	}
 }
 
@@ -47,28 +41,27 @@ function cbb_block_view_alter(array &$build, \Drupal\Core\Block\BlockPluginInter
  * Pre-render callback for block cbb enabled blocks.
  */
 function _cbb_block_view_alter_pre_render(array $build) {
+  /* TODO: can this go away?
   if (isset($build['content']) && is_string($build['content'])) {
     if (empty($build['content'])) {
       return;
     }
-
-    $build['content'] = array(
-      '#markup' => $build['content'],
-    );
+    $build['content'] = array('#markup' => $build['content']);
   }
+  */
 
-  $build['#attached']['library'] = [
-    'cbb/cbb',
-  ];
+  $build['#attached']['library'][] = 'cbb/cbb';
+
+  $blockHtmlId = Html::cleanCssIdentifier('block-' . $build['#id']);
+  $block = Block::load($build['#id']);
 
-  // TODO: fix this: fetch the getThirdPartySetting for some reason
-  $bl = $build['#cbb'];
   $build['#attached']['drupalSettings']['cbb'] = array(
-    Html::cleanCssIdentifier('block-' . $build['#id']) => array(
-      'cbb_expose_after' => $bl['cbb_expose_after'],
-      'cbb_use_colorbox' => $bl['cbb_use_colorbox'],
+    $blockHtmlId => array(
+      'cbb_expose_after' => $block->getThirdPartySetting('cbb', 'cbb_expose_after', '5 minutes'),
+      'cbb_use_colorbox' => $block->getThirdPartySetting('cbb', 'cbb_use_colorbox', false),
     ),
   );
+
   return $build;
 }