Revert "Migrated from elliott's github"

This reverts commit bedc73f18b9d2b8a8d8b74b893696752a7d0b98a.