Backing out the recent changes made to support JDK 1.8