Revert "more crap"

This reverts commit 6efc6c78f147318df47a9976bd30cc637f5d5b02.