Revert "classpath changed"

This reverts commit 852534f616f5431a00b24b1d05859cd4c8782afd.