Revert "Merge pull request #11075 from fcampo/2error-sendingSms"

This reverts commit 7f3d9b6583aa42eb31c6d93d75715e8516475e04, reversing
changes made to cabf63f047e87a807858002dc582310d8e5bad46.