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