#2095 removed java7 stuff