Moved back to JDK 1.6 to support specific client