LPS-39721

Can you review this change for me. I don't think this breaks anything, but I want to make sure and I'm not that familiar with the code.

Or let me know if someone else would be better at reviewing this. Thanks.