Fix Java7 branch integration

My build refactorings broke it.