Revert "Merge branch 'master' of https://github.com/mjvallin/telecom"

This reverts commit e5b65a9d5e6c9b2df8f54673f885b178142c84dc, reversing
changes made to 5e3c7a968e6d7cd225f3f6979caeccb5963062e5.