Revert "lots o' stuff"

This reverts commit e9b3325b9b77107c27caf2bbd60a29afee1115de.