Revert "Changes from Linux 3.4.0 -> 3.4.71"

This reverts commit e8bf169a197dce2e92de541743a3dc55d272195b.