No need to pull more chunks than needed (take 2)

Restarted the fix from a clean fork. It should merge cleanly now.