bumb upstream, cleans up gpgagent