Pull Andy's fix to remove freed class from any classqueues [PL #4233] from