Ok one more commit to revert the classloader change.