Back to Java 1.4
Reverting changes to Java 1.4 because of server limitations