Correctly preserve original -resolveClassMethod: