LPS-51565

This can probably be applied everywhere else.