FS-6353 regression from 7ba257ecd6c7ced584acbde9122479e885964795