CB has now merged the commits we pulled, so they can be removed.