This reverts commit 409040e7.

Testing of both options show identical behavior but receive-keys does
not exist on older releases, so let's revert this.

Closes #3510
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>