Restores Java 1.5 compatibility broken in r8875.