Revert to JDK 1.5