6786b2b63e
Revert for now. Build unstable and some interesting issues around CLASSPATH This reverts commit df93c13fd21a3f34aa3851893d715cbc4edb555b.