Restore Row extractor: backport #3049