GCP-7299 Fix for SSA causing a restore DB error