diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4015fdb55..ce1143c5a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -13,6 +13,7 @@ To remove the (conflicting) wrong one, do a:
   * bump youtube_dl-2020.9.14
   * bump statsd-3.3.0
   * bump synology-srm-0.2.0
+  * restore google-api-python-client-1.6.4 (still needed)
 
 2020-09-15
   * update platformio-5.0.1
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
new file mode 100644
index 000000000..a3db79567
--- /dev/null
+++ b/dev-python/google-api-python-client/Manifest
@@ -0,0 +1,4 @@
+AUX google-api-python-client-1.8.3-tests.patch 1118 BLAKE2B 41900d0b3358128626090b94f8e2a1f767a31dce97efb3c7c5750704a27f9c962cde240caafcc883497b71209c7c8b6733464d1dfee00ad13d2707cb2beee397 SHA512 a14830727ab93bece5c65d303276b6ba85c5fbe8335d97be2f0478a7ab1d37d9be688c859b4ff4ecaf966a9d95f245276c81dd4d7d4e9bb31164a33ecabf32ac
+DIST google-api-python-client-1.6.4.tar.gz 4254802 BLAKE2B befbda9fb7919590391125d88707178628b4629933291b68bacddc9559a2d09f89f125f2600aa7b9fa9cb83e02f53e5c50065d94b3282c3349dc66cb3f98bd0d SHA512 9a605a283f42151cb6b06b8cc5caf8fc230f14f5de944b2e5fedb49c91c845aed40e14350db85183bbebcc64494e75252baf3cb9bf33f377517bc718c0e98e23
+EBUILD google-api-python-client-1.6.4.ebuild 1203 BLAKE2B 3a63b915181318ec0d0003a4ba885d995a7694526054492844bfa41f2ed86264c133820e30ce5fbf5a1a9c9ed92f55bec409e4458c989ebfffaa883d8d9b753a SHA512 ae4d5b187b272bf94a0fdff95867c9c54872c018066bd0d428cc89e27ac98e741eabae3585f6a28106ce65f2d25861b45adced852baf7a048f1236f0cdcecafa
+MISC metadata.xml 381 BLAKE2B 2a802e6c566da699864dd520badb0a91eed1b7a1f26e3f20d6bd6bf7993325d07859034694d7d510984835369ea27a0c25241d9d202b3fc31fa2b52d26e42b6f SHA512 02a4ce0b16adaeaa44e041a2bfc0a4f97eb63914d10064403dae1581e3fdfda93673bb750a60e56b83c0bee46395266f7a5b846dfd65bf157253c733c8077216
diff --git a/dev-python/google-api-python-client/files/google-api-python-client-1.8.3-tests.patch b/dev-python/google-api-python-client/files/google-api-python-client-1.8.3-tests.patch
new file mode 100644
index 000000000..ad875e728
--- /dev/null
+++ b/dev-python/google-api-python-client/files/google-api-python-client-1.8.3-tests.patch
@@ -0,0 +1,28 @@
+diff --git a/tests/test_discovery.py b/tests/test_discovery.py
+index 6400f214..c999fd4f 100644
+--- a/tests/test_discovery.py
++++ b/tests/test_discovery.py
+@@ -40,6 +40,7 @@ import sys
+ import unittest2 as unittest
+ 
+ import mock
++import pytest
+ 
+ import google.auth.credentials
+ import google_auth_httplib2
+@@ -515,6 +516,7 @@ class DiscoveryFromDocument(unittest.TestCase):
+         # application default credentials were used.
+         self.assertNotIsInstance(plus._http, google_auth_httplib2.AuthorizedHttp)
+ 
++    @pytest.mark.skip("Needs network access and credentials")
+     def test_api_endpoint_override_from_client_options(self):
+         discovery = open(datafile("plus.json")).read()
+         api_endpoint = "https://foo.googleapis.com/"
+@@ -525,6 +527,7 @@ class DiscoveryFromDocument(unittest.TestCase):
+ 
+         self.assertEqual(plus._baseUrl, api_endpoint)
+ 
++    @pytest.mark.skip("Needs network access and credentials")
+     def test_api_endpoint_override_from_client_options_dict(self):
+         discovery = open(datafile("plus.json")).read()
+         api_endpoint = "https://foo.googleapis.com/"
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.6.4.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.6.4.ebuild
new file mode 100644
index 000000000..84f689ee3
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-1.6.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/google/google-api-python-client"
+SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.2[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-2[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-5[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/google-auth-httplib2[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	export SKIP_GOOGLEAPICLIENT_COMPAT_CHECK=true
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/google-api-python-client/metadata.xml b/dev-python/google-api-python-client/metadata.xml
new file mode 100644
index 000000000..702c609a9
--- /dev/null
+++ b/dev-python/google-api-python-client/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="github">google/google-api-python-client</remote-id>
+  </upstream>
+</pkgmetadata>