Revert imports to Eclipse format. JDK7 is required to build