massive reconfiguration time again.

Now just have to track down some hang 10 samples.