Remove bundling of modules with the base build