go back supporting java 6