Revert "Update with new telephony repos"

This reverts commit ab2d96613b6aed452b2be9cd784f836801015aa2.
Revert "Fixing things"

This reverts commit acbe8f749af8feb684c77aa01a46e852c6281a82.