Revert back to Java EE 6