Revert "more config options, also possibly breaks things."

This reverts commit 78bae92be99bdbbda4084d82757779aa4c3f2768.