Revert "Fix from last commit"

This reverts commit 48cb182d970a687c84b806c4fa0cb0f6e69330b8.
Revert "Fixes with CAF Merge"

This reverts commit 74253fa1512c286cf79d93024164f64543c919e7.

Conflicts:
	arch/arm/mm/mmu.c
	net/ipv4/ping.c