Revert "merge fixes"

This reverts commit 6f3a91ca9239dbf3baf40b5764b2dbd7b89db041.
Revert "Linux 3.4.60"

This reverts commit e09a70ebbbfa8136e38a40f72acbebb585536ad4.