Correct my recovery placement and return CM recovery to rightful, unused spot!

Change-Id: I719d3f9a097f2e54eb0117e8d0a16b38ca0e3bfe
Sneak sneak. Stab stab. (dagger+butterknife)

Change-Id: I280b4f61f344acd4585d36be243fc15519dc9c81