implements the primary change suggested by https://gitlab.torproject.org/tpo/web/support/-/issues/341