Revert "Finish off gradle conversion"

This reverts commit fd3a8a3e543b0be0356d5869de0ea272b41d37ac.