Bug 16965: [Follow-up] Adjust get_object_class