Revert "Fix increasing ringer NPE"

This reverts commit 8798914e70ec29c1b504a2745f9cea07631e94f7.
Revert "Phone and ringer squish (1/3)"

This reverts commit ea857c595d0a39a42415bd9577ce6cced2ca33e6.