LPS-33017 Revert LPS-31148