This reverts commit 3f7e3db74426f658b4625505d262c1f7b288606d. This broke the gpg-agent user service. See #27468.