Revert "LPS-50156 update"