Swithced back to building on jdk7