Revert "Merge branch 'Cyanogen/cm-10.2'"

This reverts commit 71cf4abdb9b843390b3a1d86d91dab28ce970ffa, reversing
changes made to e24450f6d326c4161f88384e84ea02bc4bcf1bbb.