Bring H back to working state

 * Revert all the RIL / QMI stuff for today.

Change-Id: I180c25207dab5a5136080a4eee576ae45941699f