Revert "Additional sensors fix (Credit to Chrissi Cool)"
We are reverting back to a stable build where dialer isn't broken.

This reverts commit 45d906053c3e0d0cc7a4016d95527614fcd2e23c.
Revert "Misc fixes as passed to us"
(Need to get back to stable where dialer working)

This reverts commit 929d1854e9e90c3e3d470302d55914f4cef3b89c.