Revert to JDK 1.6 functionality