Address keybase/keybase-issues#544