This breaks running the JUnit tests, we'll bring it back soon