Issue #3612489: Reimport only the queued rows via the new source and drop the prepare-row skip mechanism
Closes #3612489