Revert "a pile of crap"

This reverts commit 7b438929d31c744c26539f8614a0eb8b83c033b9.