Revert "New BOOTCLASSPATH"

This reverts commit 702f6d8ba3f0f09219f8dfcce6b9eec4697a6617.