Revert some gradle changes