Removed the checks for the module loader to fit changes in mainline