Remove generics from one of the latest commits to preserve compatibility
with java 1.6