Revert "dumpstate: Squash fixes from CM 10.0"

* this is a hack and isn't need by the Superuser method we officially support so revert it

This reverts commit dc202eff36367f5d478bb02c2937fe5558467ec0.