Reverted back to java 1.6 style.