massive reconfiguration time again.

This ought to do it?