A per class structure was not correctly reinitialised. bug #316397 - based on patch by Vipin Aravind.