More pre gradle changes, hopefully the last one.