Revert "Merge pull request #184 from ProjectMeshnet/f.pgp"

This branch isn't ready to be in master yet, I think because it causes
some problems with emails. Once the formatting issues are resolved, then
it can be merged in.

This reverts commit a3a3739a726b63da002e84dab346b36ea3a8cf6b, reversing
changes made to eac924aa2e946ec7e02084c775e838515ce5c57a.