Revert "Try new classpath"

This reverts commit 853eb9329f7207bba365435111a3c62c8e42ec69.