Revert "rollback to before SMS"

This reverts commit 7bbdd78176eb3c420152e6c92bf78f08193a074c.