Merge pull request #738 from gpodder/revert-684-patch-1