Merge "Revert to gsutil"