diff --git a/core/modules/aggregator/aggregator.admin.inc b/core/modules/aggregator/aggregator.admin.inc
index 9b9d2be..6dbf831 100644
--- a/core/modules/aggregator/aggregator.admin.inc
+++ b/core/modules/aggregator/aggregator.admin.inc
@@ -5,8 +5,9 @@
  * Admin page callbacks for the aggregator module.
  */
 
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Drupal\aggregator\Plugin\FetcherManager;
+use Guzzle\Http\Exception\BadResponseException;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
 /**
  * Page callback: Displays the aggregator administration page.
@@ -353,12 +354,15 @@ function aggregator_form_opml_submit($form, &$form_state) {
     $data = file_get_contents($file->uri);
   }
   else {
-    $response = drupal_http_request($form_state['values']['remote']);
-    if (!isset($response->error)) {
-      $data = $response->data;
-    }
-    else {
-      watchdog('aggregator', 'HTTP request to @url failed with error: @error', array('@url' => $form_state['values']['remote'], '@error' => $response->error));
+    try {
+      $response = drupal_container()
+        ->get('http_default_client')
+        ->get($form_state['values']['remote'])
+        ->send();
+      $data = $response->getBody(TRUE);
+    } catch (BadResponseException $e) {
+      $error = $e->getResponse() ? $e->getResponse()->getReasonPhrase() : $e->getMessage();
+      watchdog('aggregator', 'HTTP request to @url failed with error: @error', array('@url' => $form_state['values']['remote'], '@error' => $error));
     }
   }
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
index 2df801a..c80b31e 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
@@ -15,8 +15,6 @@
 /**
  * Defines a default fetcher implementation.
  *
- * Uses drupal_http_request() to download the feed.
- *
  * @Plugin(
  *   id = "aggregator",
  *   title = @Translation("Default fetcher"),