Revert "Misc fixes as passed to us"
(Need to get back to stable where dialer working)

This reverts commit 929d1854e9e90c3e3d470302d55914f4cef3b89c.