Reverted broken patch in #2360 and tried to fix it cleanly
Merge branch 'master' of https://github.com/inverse-inc/sogo