Address keybase/keybase-issues#1020