Temporarily removed core bundle dependency