diff -Nru php-guzzlehttp-psr7-1.7.0/debian/autoload.php.tpl php-guzzlehttp-psr7-1.7.0/debian/autoload.php.tpl
--- php-guzzlehttp-psr7-1.7.0/debian/autoload.php.tpl	2021-01-20 22:40:46.000000000 +0000
+++ php-guzzlehttp-psr7-1.7.0/debian/autoload.php.tpl	2021-01-26 02:11:59.000000000 +0000
@@ -1,7 +1,7 @@
 <?php
 
 require_once 'Psr/Http/Message/autoload.php';
-require_once __DIR__ . '/getallheaders.php';
+require_once 'getallheaders/getallheaders.php';
 require_once __DIR__ . '/functions_include.php';
 
 // @codingStandardsIgnoreFile
diff -Nru php-guzzlehttp-psr7-1.7.0/debian/changelog php-guzzlehttp-psr7-1.7.0/debian/changelog
--- php-guzzlehttp-psr7-1.7.0/debian/changelog	2021-01-20 22:41:37.000000000 +0000
+++ php-guzzlehttp-psr7-1.7.0/debian/changelog	2021-01-26 02:21:04.000000000 +0000
@@ -1,3 +1,9 @@
+php-guzzlehttp-psr7 (1.7.0-1) unstable; urgency=medium
+
+  * Revert "Bundle php-getallheaders being processed in NEW"
+
+ -- David Prévot <taffit@debian.org>  Mon, 25 Jan 2021 22:21:04 -0400
+
 php-guzzlehttp-psr7 (1.7.0-1~deb11u2) unstable; urgency=medium
 
   * Fix test for recent versions of PHP (Closes: #980664)
diff -Nru php-guzzlehttp-psr7-1.7.0/debian/control php-guzzlehttp-psr7-1.7.0/debian/control
--- php-guzzlehttp-psr7-1.7.0/debian/control	2021-01-20 22:40:46.000000000 +0000
+++ php-guzzlehttp-psr7-1.7.0/debian/control	2021-01-26 02:19:48.000000000 +0000
@@ -4,6 +4,7 @@
 Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
 Uploaders: David Prévot <taffit@debian.org>
 Build-Depends: debhelper-compat (= 13),
+               php-getallheaders,
                php-psr-http-message,
                phpab,
                phpunit,
diff -Nru php-guzzlehttp-psr7-1.7.0/debian/copyright php-guzzlehttp-psr7-1.7.0/debian/copyright
--- php-guzzlehttp-psr7-1.7.0/debian/copyright	2021-01-20 22:40:46.000000000 +0000
+++ php-guzzlehttp-psr7-1.7.0/debian/copyright	2021-01-26 02:19:48.000000000 +0000
@@ -6,7 +6,6 @@
 Files: *
 Copyright: 2015, Michael Dowling <mtdowling@gmail.com>
            2018, amphp
-           2014, Ralph Khattar
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
diff -Nru php-guzzlehttp-psr7-1.7.0/debian/patches/0001-Bundle-php-getallheaders-being-processed-in-NEW.patch php-guzzlehttp-psr7-1.7.0/debian/patches/0001-Bundle-php-getallheaders-being-processed-in-NEW.patch
--- php-guzzlehttp-psr7-1.7.0/debian/patches/0001-Bundle-php-getallheaders-being-processed-in-NEW.patch	2021-01-20 22:40:46.000000000 +0000
+++ php-guzzlehttp-psr7-1.7.0/debian/patches/0001-Bundle-php-getallheaders-being-processed-in-NEW.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
-Date: Thu, 14 Jan 2021 09:33:06 -0400
-Subject: Bundle php-getallheaders being processed in NEW
-
----
- src/getallheaders.php | 46 ++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 46 insertions(+)
- create mode 100644 src/getallheaders.php
-
-diff --git a/src/getallheaders.php b/src/getallheaders.php
-new file mode 100644
-index 0000000..c7285a5
---- /dev/null
-+++ b/src/getallheaders.php
-@@ -0,0 +1,46 @@
-+<?php
-+
-+if (!function_exists('getallheaders')) {
-+
-+    /**
-+     * Get all HTTP header key/values as an associative array for the current request.
-+     *
-+     * @return string[string] The HTTP header key/value pairs.
-+     */
-+    function getallheaders()
-+    {
-+        $headers = array();
-+
-+        $copy_server = array(
-+            'CONTENT_TYPE'   => 'Content-Type',
-+            'CONTENT_LENGTH' => 'Content-Length',
-+            'CONTENT_MD5'    => 'Content-Md5',
-+        );
-+
-+        foreach ($_SERVER as $key => $value) {
-+            if (substr($key, 0, 5) === 'HTTP_') {
-+                $key = substr($key, 5);
-+                if (!isset($copy_server[$key]) || !isset($_SERVER[$key])) {
-+                    $key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', $key))));
-+                    $headers[$key] = $value;
-+                }
-+            } elseif (isset($copy_server[$key])) {
-+                $headers[$copy_server[$key]] = $value;
-+            }
-+        }
-+
-+        if (!isset($headers['Authorization'])) {
-+            if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
-+                $headers['Authorization'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
-+            } elseif (isset($_SERVER['PHP_AUTH_USER'])) {
-+                $basic_pass = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
-+                $headers['Authorization'] = 'Basic ' . base64_encode($_SERVER['PHP_AUTH_USER'] . ':' . $basic_pass);
-+            } elseif (isset($_SERVER['PHP_AUTH_DIGEST'])) {
-+                $headers['Authorization'] = $_SERVER['PHP_AUTH_DIGEST'];
-+            }
-+        }
-+
-+        return $headers;
-+    }
-+
-+}
diff -Nru php-guzzlehttp-psr7-1.7.0/debian/patches/series php-guzzlehttp-psr7-1.7.0/debian/patches/series
--- php-guzzlehttp-psr7-1.7.0/debian/patches/series	2021-01-20 22:40:46.000000000 +0000
+++ php-guzzlehttp-psr7-1.7.0/debian/patches/series	2021-01-26 02:12:14.000000000 +0000
@@ -1,2 +1 @@
-0001-Bundle-php-getallheaders-being-processed-in-NEW.patch
 0002-Fixed-bad-test-355.patch
diff -Nru php-guzzlehttp-psr7-1.7.0/debian/pkg-php-tools-overrides php-guzzlehttp-psr7-1.7.0/debian/pkg-php-tools-overrides
--- php-guzzlehttp-psr7-1.7.0/debian/pkg-php-tools-overrides	2021-01-20 22:40:46.000000000 +0000
+++ php-guzzlehttp-psr7-1.7.0/debian/pkg-php-tools-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-ralouphie	getallheaders	none