Revert "Fixed compilation issue with Java 1.6"

This reverts commit 975b2e93f877e3dde9151f3c7c5197e96130e69c.