LPS-36641 Revert