LPS-38326 Revert LPS-36179