Revert build.gradle changes, keep classpath changes