diff --git a/lib/setup.php b/lib/setup.php
index f43b4b9fac9..82399d08658 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -427,16 +427,6 @@ if (!empty($CFG->cachetype)) {
     $CFG->rcache    = false;
 }
 
-// Set a default enrolment configuration (see bug 1598)
-if (!isset($CFG->enrol)) {
-    $CFG->enrol = 'manual';
-}
-
-// Set default enabled enrolment plugins
-if (!isset($CFG->enrol_plugins_enabled)) {
-    $CFG->enrol_plugins_enabled = 'manual';
-}
-
 // File permissions on created directories in the $CFG->dataroot
 if (empty($CFG->directorypermissions)) {
     $CFG->directorypermissions = 0777;      // Must be octal (that's why it's here)