diff --git a/core/modules/system/src/Form/FileSystemForm.php b/core/modules/system/src/Form/FileSystemForm.php
index b5759f3..8cf5eb3 100644
--- a/core/modules/system/src/Form/FileSystemForm.php
+++ b/core/modules/system/src/Form/FileSystemForm.php
@@ -87,7 +87,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#type' => 'item',
       '#title' => t('Private file system path'),
       '#markup' => (PrivateStream::basePath() ? PrivateStream::basePath() : t('Not set')),
-      '#description' => t('An existing local file system path for storing private files. It should be writable by Drupal and not accessible over the web. This must be changed in settings.php. See the online handbook for <a href="@handbook">more information about securing private files</a>.', array('@handbook' => 'http://drupal.org/documentation/modules/file')),
+      '#description' => t('An existing local file system path for storing private files. It should be writable by Drupal and not accessible over the web. This must be changed in settings.php'),
     );
 
     $form['file_temporary_path'] = array(
diff --git a/core/modules/system/src/Tests/File/ConfigTest.php b/core/modules/system/src/Tests/File/ConfigTest.php
index aa37efd..4d3cf6f 100644
--- a/core/modules/system/src/Tests/File/ConfigTest.php
+++ b/core/modules/system/src/Tests/File/ConfigTest.php
@@ -38,8 +38,8 @@ function testFileConfigurationPage() {
     );
 
     // Check that public and private can be selected as default scheme.
-    $this->assertFieldById('edit-file-default-scheme-public');
-    $this->assertFieldById('edit-file-default-scheme-private');
+    $this->assertText('Public local files served by the webserver.');
+    $this->assertText('Private local files served by Drupal.');
 
     $this->drupalPostForm(NULL, $fields, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'));
@@ -54,11 +54,11 @@ function testFileConfigurationPage() {
       'required' => TRUE,
     );
     $this->writeSettings($settings);
-    drupal_flush_all_caches();
+    $this->rebuildContainer();
 
     $this->drupalGet('admin/config/media/file-system');
-    $this->assertFieldById('edit-file-default-scheme-public');
-    $this->assertNoFieldById('edit-file-default-scheme-private');
+    $this->assertText('Public local files served by the webserver.');
+    $this->assertNoText('Private local files served by Drupal.');
   }
 
 }
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 36385f7..e21206b 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -437,6 +437,9 @@
  * must be absolute, outside of the the Drupal installation directory and not
  * accessible over the web.
  *
+ * Note: Caches need to be cleared when this value is changed to make the
+ * private:// stream wrapper available to the system.
+ *
  * See http://drupal.org/documentation/modules/file for more information about
  * securing private files.
  */