remove the fix for GCP-7958 to avoid conflict with restoring users table