massive reconfiguration time again.

Just poking the bear.