IDEA-CR-1041 (class loader substitution is only needed on 1.7+)