Reverted classpath changes from fork.