Revert "fixing bad config, take out feature, move origin"

This reverts commit 99499b6b0e5fb72544084ee2f48ecc21823f2325.