Revert "Merge pull request #2375 from michaelklishin/patch-1"
Revert "Merge pull request #2375 from michaelklishin/patch-1"

This reverts commit e109d22ce5fa60b7d05f0ad101e49b406b312458, reversing
changes made to 4f993b3d246d0866e281ad4109bb4c768a30393b.

despora/diaspora,jhass/diaspora,Muhannes/diaspora,Muhannes/diaspora,SuperTux88/diaspora,Amadren/diaspora,diaspora/diaspora,KentShikama/diaspora,geraspora/diaspora,Muhannes/diaspora,Flaburgan/diaspora,KentShikama/diaspora,jhass/diaspora,KentShikama/diaspora,Amadren/diaspora,despora/diaspora,Flaburgan/diaspora,diaspora/diaspora,jhass/diaspora,spixi/diaspora,Muhannes/diaspora,spixi/diaspora,Amadren/diaspora,spixi/diaspora,Flaburgan/diaspora,Amadren/diaspora,geraspora/diaspora,despora/diaspora,spixi/diaspora,jhass/diaspora,Flaburgan/diaspora,SuperTux88/diaspora,diaspora/diaspora,SuperTux88/diaspora,despora/diaspora,geraspora/diaspora,KentShikama/diaspora,SuperTux88/diaspora,diaspora/diaspora,geraspora/diaspora