Revert "Revert "classpath""

This reverts commit 86cef354bd16d7c38ec7dba52ab8b28255b49d85.