Revert "attempt to fix recovery reboot"

This reverts commit 0c511c0f253278297b5ddb23caa2165f1f10f32c.
Merge remote-tracking branch 'origin/jb-mr1' into cm-10.1