Revert Ed's classpath changes as it breaks mine and Michelle's Eclipse

(cherry picked from commit 198449a9f327c1c8c8e04d2f96c67e6acbf17ca9)