I spent all morning screwing with things.

Now UpgradeHelper isn't special. Not the good special either.