Existing broken configs repaired.

Reverts dumb changes the new configs seemed to make (maybe they were merged in the wrong order?)