c1bd5c1780
closes PR 42301. Since the 41167 fix was pulled up to -5, this needs to be too.
closes PR 42301. Since the 41167 fix was pulled up to -5, this needs to be too.