Wrong patch applied; missed jdk7 handling This reverts commit a36dbe6f354b0318c944177833f4952a9136ef58.