Revert "CWMR fixup"

This reverts commit 6d30f6c09881c38c5f12ac8473a0b93ed0aee509.

Conflicts:
	recovery.fstab

	modified:   BoardConfig.mk