Merge "Revert "Remove autoscaling until gate issues sorted out""