Revert "change optimizations to allow kernel built with 4.8.1 toolchain to boot"

This reverts commit 28748145370a672167b59f64afd3ef75717481da.