Revert "Misc tweaks"

This reverts commit b12c5a91d14dd07a1b798b1cd5e4a1f75b9f5e15.
Squashed update of kernel from 3.4.59 to 3.4.60