Revert "Merge pull request #18394 from mikehenrty/bug-995907-smsentry"

This reverts commit 128e558f0159c38d3ef60fc38d5a09910b62233e, reversing
changes made to 3e5af788dc532eadf4ce9fae2de9ac4fa76c930c.