Merge "Revert "Service requests can interrupt node prefetching"" into sc-dev