LPS-49307 simplify this one too