Revert "LPS-46537 SF"