Merge "Remove autoscaling until gate issues sorted out"