Revert "hmm, I hate it if these things work locally..."
Revert "hmm, I hate it if these things work locally..."

This reverts commit 4cebe423755d5306d90c042dcc20bc0ba0c63a55.

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