Since this now implements Runnable, keep compatibility with Java 1.5.
Merge bug25999 (again)