LPS-41629 Revert LPS-34284