Revert "RC: Toggle rewrite (2/2) - AOKP!!"

This reverts commit 41b925e080321654214be63261424e6f76c747c1.
RC: Toggle rewrite (2/2)

PS2: Rebase

Change-Id: Idb9c658ae8a9682812c60f94088e5209bb120d61