Since ppl want to be bitches -- Revert "edits"

This reverts commit 40487067bd9ea4865b60caa1bc16de845c842805.

Conflicts:
	arch/arm/configs/cyanogenmod_hercules_defconfig