Revert "shooter: ION"

This reverts commit f783ee9244e9c1b4a492cae9a33aa66e60bd6e14.
shooter: ION
Merge branch 'cm-10.1', remote-tracking branch 'hydra/cm-10.1' into cm-10.1