LPS-34804 Revert the Rollback - includes commit which fixes the previous issue

The first commit was already reviewed