Revert "[CS] Do fewer regex matches on channel strings for call setup"

This reverts commit 00dbe43cf5ec5a8bc3fe7754ba0a3be24a372290.