LPS-37901 revert fix