Revert "Fixes for kernel compile w/ 4.8"

This reverts commit 0bff56afee01320c02b0a50ff0b2569f735c0365.