diff --git a/src/common/read_config.c b/src/common/read_config.c
index dc3831aa5b8ea3545894782d82039cb9aff81b0a..329f6020a918bcfb6c3c50ba5d8c732cba1f3d1d 100644
--- a/src/common/read_config.c
+++ b/src/common/read_config.c
@@ -4187,15 +4187,8 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
 
 	/* see above for switch_type, order dependent */
 
-	if (!s_p_get_string(&conf->task_plugin, "TaskPlugin", hashtbl)) {
+	if (!s_p_get_string(&conf->task_plugin, "TaskPlugin", hashtbl))
 		conf->task_plugin = xstrdup(DEFAULT_TASK_PLUGIN);
-	} else {
-		char *cray_ptr = strstr(conf->task_plugin, "cray");
-		char *cgroup_ptr = strstr(conf->task_plugin, "cgroup");
-		if (cray_ptr && (!cgroup_ptr || (cgroup_ptr > cray_ptr)))
-			fatal("TaskPlugin: task/cgroup must preceed task/cray");
-	}
-
 #ifdef HAVE_FRONT_END
 	if (xstrcmp(conf->task_plugin, "task/none")) {
 		error("On FrontEnd systems TaskPlugin=task/none is required");