Update CM patches

Remade completely since I saw a report of recent mobile data issues. Hope this
does it, I have no wish to revisit 4.3.

closes #192
closes #193