Merge "Revert "Use slaves created from cloud""