Merge "Revert "Update to using pike cloud-archive""