Restore JDK 5 compatiblity