Revert "...and more FC"

This reverts commit 728e7d74e5944b19b01f690572f8c759851b17cc.

Conflicts:

	arch/arm/configs/cyanogenmod_hercules_defconfig