Change the tabbing back to 2 spaces
Change the gradle files back