Fixing broken build - used a Java 1.6 feature, when source is supposed
to be at 1.5