Undoing the separation of the coral_core from coral_core_basic.