Re-add Java 6 compatibility. (my bad)