FORGE-820 works on Sun/Oracle JDK7