Don't need to patch java 1.7 build fix anymore