LPS-34960 revert LPS-31250
LPS-34960 fixing LPS-31250 again