Fix r66858 -- reassign classes in the AutoLoader