Revert
Merge branch 'master' of github.com:slygent/froide