Refactor zcml usage to the old bbb version