reverted fix of warnings related to JDK 1.7