diff --git a/core/modules/user/src/Tests/Update/UpdateMailChangeTest.php b/core/modules/user/src/Tests/Update/UpdateMailChangeTest.php
index 8fde087..55c830f 100644
--- a/core/modules/user/src/Tests/Update/UpdateMailChangeTest.php
+++ b/core/modules/user/src/Tests/Update/UpdateMailChangeTest.php
@@ -45,8 +45,8 @@ public function testMailChangeUpdate() {
     $user_mail = $this->config('user.mail');
 
     // Check that mail change notifications were set to TRUE.
-    $this->assertTrue($user_settings->get('notify.mail_change_notification'));
-    $this->assertTrue($user_settings->get('notify.mail_change_verification'));
+    $this->assertFalse($user_settings->get('notify.mail_change_notification'));
+    $this->assertFalse($user_settings->get('notify.mail_change_verification'));
     $this->assertIdentical($user_settings->get('mail_change_timeout'), 86400);
 
     $config = Yaml::parse(file_get_contents(__DIR__ . '/../../../config/install/user.mail.yml'));
diff --git a/core/modules/user/user.post_update.php b/core/modules/user/user.post_update.php
index 6fd83e9..c463cc7 100644
--- a/core/modules/user/user.post_update.php
+++ b/core/modules/user/user.post_update.php
@@ -18,10 +18,9 @@
 function user_post_update_mail_change() {
   $config_factory = \Drupal::service('config.factory');
 
-  $config = Yaml::parse(file_get_contents(__DIR__ . '/config/install/user.settings.yml'));
   $config_factory->getEditable('user.settings')
-    ->set('notify.mail_change_notification', $config['notify']['mail_change_notification'])
-    ->set('notify.mail_change_verification', $config['notify']['mail_change_verification'])
+    ->set('notify.mail_change_notification', FALSE)
+    ->set('notify.mail_change_verification', FALSE)
     ->set('mail_change_timeout', 86400)
     ->save();