Revert hasty config change, needs more testing.