Revert build.gradle changes to match master