Moving this discussion from #14329 (comment).

I could go either way but maybe s makes more sense to be consistent with older versions of LH.