Split out prepare_patches and fetch_patches methods.

The new `fetch_patches` method wasn't exclusively fetching so shouldn't
have been skipped when it was.

Fixes #7558.