Revert "Changes to support building with Java 5"

This reverts commit 9f2cdaf4ac02a02ebf564316794e81559503e0fb.