massive reconfiguration time again.

I told you so!