Partially revert coremod, untested