Reverted all Java7 features.  Happily only diamonds and try-with-resource in tests.