Do not revert to java 7