Made it Java 6 compatible again as IBM Java 6 is still supported and
used at some places.