According to the parent issue, the classloader check optimization is probably unecessary, so remove it in the next CR release.