This reverts commit 7aa0580c.
As stated in #2316 (closed), that commit was a workaround to allow gnome-keyring
and msmtp to continue to get their session bus address from
DBUS_SESSION_BUS_ADDRESS, even though they’re AT_SECURE. The timeout
on that workaround has expired so that commit is now being reverted.
Fixes: #2316 (closed)