Revert "uncrap stuff"

This reverts commit 2ae34756168dfa45755e103b26e5d9c55b83690c.