diff --git a/.gitignore b/.gitignore
index fe392de..2d8dab4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /serverless-application-model-1.55.0.tar.gz
 /serverless-application-model-1.56.0.tar.gz
 /serverless-application-model-1.57.0.tar.gz
+/serverless-application-model-1.58.0.tar.gz
diff --git a/python-aws-sam-translator.spec b/python-aws-sam-translator.spec
index ad67647..1fc4819 100644
--- a/python-aws-sam-translator.spec
+++ b/python-aws-sam-translator.spec
@@ -1,6 +1,6 @@
 Name:           python-aws-sam-translator
 Summary:        Transform SAM templates into AWS CloudFormation templates
-Version:        1.57.0
+Version:        1.58.0
 Release:        %autorelease
 
 License:        Apache-2.0
@@ -29,6 +29,20 @@ Summary:        %{summary}
 
 BuildArch:      noarch
 
+# The bundled version is quite close to upstream. It has some “ignore” type
+# annotations added, some if statements were reordered (apparently to put this
+# library’s common case first for performance), and an LRU cache layer was
+# added.
+#
+# When the type annotations were the only difference, we unbundled this as a
+# downstream patch. Now we bundle again, but we have asked upstream about a
+# path to unbundling—a request which was mandated by
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/#bundling:
+#
+#   Path to using upstream py27hash as a dependency?
+#   https://github.com/aws/serverless-application-model/issues/2815
+Provides:       bundled(python3dist(py27hash)) = 1.0.2
+
 Obsoletes:      python-aws-sam-translator-doc < 1.54.0-1
 
 %description -n python3-aws-sam-translator %{common_description}
@@ -37,14 +51,6 @@ Obsoletes:      python-aws-sam-translator-doc < 1.54.0-1
 %prep
 %autosetup -n serverless-application-model-%{version}
 
-# Unbundle bundled “third-party” dependencies
-rm -rvf THIRD_PARTY_LICENSES samtranslator/third_party
-sed -r -i '/^[[:blank:]]*"THIRD_PARTY_LICENSES",[[:blank:]]*$/d' setup.py
-sed -r -i '/^[[:blank:]]*THIRD_PARTY_LICENSES[[:blank:]]*$/d' setup.cfg
-sed -r -i 's/samtranslator\.third_party\.(py27hash)/\1/g' \
-    samtranslator/utils/py27hash_fix.py
-echo 'py27hash >= 1.0.2' >> requirements/base.txt
-
 # Comment out a few dev dependencies that we will not use. Then, loosen
 # selected semver-pinned dev dependencies, allowing newer versions.
 sed -r -i \
@@ -87,7 +93,8 @@ AWS_DEFAULT_REGION=us-east-1 %pytest -k "${k-}" -n auto
 
 
 %files -n python3-aws-sam-translator -f %{pyproject_files}
-# pyproject-rpm-macros handles LICENSE/NOTICE; verify with “rpm -qL -p …”
+# pyproject-rpm-macros handles LICENSE/NOTICE/THIRD_PARTY_LICENSES; verify with
+# “rpm -qL -p …”
 %doc CODE_OF_CONDUCT.md
 %doc CONTRIBUTING.md
 %doc DESIGN.md
diff --git a/sources b/sources
index db8b153..e0ab6fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (serverless-application-model-1.57.0.tar.gz) = 0451ffdd4ce79ab3416d63807e068d0431e18180bbd82fb2abb5c14d03ef7232d5e7a2ee13e454df17894bdaca1813fb2af4bbfb87ef274c5c31d64371f05336
+SHA512 (serverless-application-model-1.58.0.tar.gz) = ce2002c967b9dfc973d61ee2462010ccfc0b8dc9aa2233234205fe38467c5bfc115f27bb34c1e3a8f7d5b669b4190ca2bd983590fa8de898899133e54190223b