Revert "Remove more stuff from old kernel"

This reverts commit 661c764787659c61f88c35360569e12fc21ab2c5.
Squashed update of kernel from 3.0.62 to 3.0.63