IC2 is now fixed.  Woohoo.

And I did it the right way, even.