LPS-49589 undo unrelated change