Revert "Minor Classpath update"

This reverts commit 6a8888ff0f19904c4f119d5f96e261d54b74bb23.