~ changes to be compatible with kernel stuff
Revert "~ changes to be compatible with kernel stuff"

This reverts commit 1df3e5b6de19f6f3b7976940af8608eb29774440.
~ reverting most of changes now that can use a stripped std