reverted some code of https://github.com/globaleaks/GLBackend/commit/12d804a5f2a3402606cf796257474e3637082664