Revert "Switch to different location for Java 6" This reverts commit d165dc9ebb29e19011d6f75f7102bf3713c37df6.