Reverting back the changes to support JDK 1.8, which was meant for another check in.