This reverts commit 0c80cff8. The commit broke NeoChat and Arianna
mentioned in commit a69ee8e0
mentioned in commit 0b0cb8f4