FS-5759 --resolve regression from e45774e76464659bbfdb550ee29a399bf7854cc0 re: FS-5620