Fix gradle build, again