Reverted generics changes suggested by eclipse as they are not supported with java 6 (on OSX)