Revert "Combined PRs"

[ewdurbin]

Reverts #16301

Something here broke local dev.

docker compose run --rm web python -m warehouse db upgrade head
[+] Creating 4/0
 ✔ Container warehouse-redis-1       Created                                                                                                                                                                                                                            0.0s 
 ✔ Container warehouse-stripe-1      Created                                                                                                                                                                                                                            0.0s 
 ✔ Container warehouse-db-1          Running                                                                                                                                                                                                                            0.0s 
 ✔ Container warehouse-opensearch-1  Created                                                                                                                                                                                                                            0.0s 
[+] Running 3/3
 ✔ Container warehouse-redis-1       Started                                                                                                                                                                                                                            0.2s 
 ✔ Container warehouse-stripe-1      Started                                                                                                                                                                                                                            0.2s 
 ✔ Container warehouse-opensearch-1  Started                                                                                                                                                                                                                            0.2s 
Traceback (most recent call last):
  File "/opt/warehouse/lib/python3.12/site-packages/pyramid/path.py", line 387, in _zope_dottedname_style
    found = getattr(found, n)
            ^^^^^^^^^^^^^^^^^
AttributeError: module 'pyramid_debugtoolbar.panels' has no attribute 'versions'. Did you mean: 'session'?

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "<frozen runpy>", line 198, in _run_module_as_main
  File "<frozen runpy>", line 88, in _run_code
  File "/opt/warehouse/src/warehouse/__main__.py", line 18, in <module>
    sys.exit(warehouse())
             ^^^^^^^^^^^
  File "/opt/warehouse/lib/python3.12/site-packages/click/core.py", line 1157, in __call__
    return self.main(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/warehouse/lib/python3.12/site-packages/click/core.py", line 1078, in main
    rv = self.invoke(ctx)
         ^^^^^^^^^^^^^^^^
  File "/opt/warehouse/lib/python3.12/site-packages/click/core.py", line 1688, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/warehouse/lib/python3.12/site-packages/click/core.py", line 1688, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/warehouse/lib/python3.12/site-packages/click/core.py", line 1434, in invoke
    return ctx.invoke(self.callback, **ctx.params)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/warehouse/lib/python3.12/site-packages/click/core.py", line 783, in invoke
    return __callback(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/warehouse/lib/python3.12/site-packages/click/decorators.py", line 45, in new_func
    return f(get_current_context().obj, *args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/warehouse/src/warehouse/cli/db/upgrade.py", line 26, in upgrade
    alembic.command.upgrade(config.alembic_config(), revision, **kwargs)
                            ^^^^^^^^^^^^^^^^^^^^^
  File "/opt/warehouse/src/warehouse/cli/__init__.py", line 34, in __getattr__
    self.__config = configure(*self.__args, **self.__kwargs)
                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/warehouse/src/warehouse/config.py", line 550, in configure
    config.include("pyramid_debugtoolbar")
  File "/opt/warehouse/lib/python3.12/site-packages/pyramid/config/__init__.py", line 666, in include
    c(configurator)
  File "/opt/warehouse/lib/python3.12/site-packages/pyramid_debugtoolbar/__init__.py", line 126, in includeme
    application = make_toolbar_app(settings, config.registry)
                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/warehouse/lib/python3.12/site-packages/pyramid_debugtoolbar/toolbar_app.py", line 68, in make_toolbar_app
    config.include(include)
  File "/opt/warehouse/lib/python3.12/site-packages/pyramid/config/__init__.py", line 632, in include
    c = self.maybe_dotted(callable)
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/warehouse/lib/python3.12/site-packages/pyramid/config/__init__.py", line 740, in maybe_dotted
    return self.name_resolver.maybe_resolve(dotted)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/warehouse/lib/python3.12/site-packages/pyramid/path.py", line 327, in maybe_resolve
    return self._resolve(dotted, package)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/warehouse/lib/python3.12/site-packages/pyramid/path.py", line 334, in _resolve
    return self._zope_dottedname_style(dotted, package)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/opt/warehouse/lib/python3.12/site-packages/pyramid/path.py", line 389, in _zope_dottedname_style
    __import__(used)
  File "/opt/warehouse/lib/python3.12/site-packages/pyramid_debugtoolbar/panels/versions.py", line 21, in <module>
    'lowername': name.lower(),
                 ^^^^^^^^^^
AttributeError: 'NoneType' object has no attribute 'lower'