Revert "More cool stuff"

This reverts commit 256ad8fa034f39869eb83214e9c0ab8b71840b5f.