Revert "REVERT BEFORE MERGING: this is just to trigger tests"
Revert "REVERT BEFORE MERGING: this is just to trigger tests"

This reverts commit 331568b11d89888df72499c3498aac1709045251.

keybase/client,keybase/client,keybase/client,keybase/client,keybase/client,keybase/client,keybase/client,keybase/client,keybase/client,keybase/client,keybase/client,keybase/client