Revert b76df142d670e51acd673cab9578f2312e5582c8

Signed-off-by: Sean Qureshi <sean@tox.im>
Merge branch 'master' of github.com:Tox/ToxOS