I'm not familiar with phabricator software so perhaps there is a better way to attach a diff to this ticket. Here is the diff I created: https://dev.gnupg.org/differential/diff/1543/