Revert 7f6a31b..16771e2

This rolls back to commit 7f6a31b8a6444101839fbb4884d446953906eade.
Trying to fix the JAR/source mess