Revert "[4.0] Fix to get the full input text in RetrieveSurrounding"