More config shuffling.