new classpath
Revert "new classpath"

This reverts commit 216e870ce270dd37f10cb3f0bdc14f4fb323296e.