Fixes diaspora/diaspora#4720