Restore LPS-39116 logic