Switch back to stock kernel and beautify code a bit.