FS-5449: apply correct quoting, got older version of patch accidentally
FS-5488 --resolve