Add back some core modules for now