Spin on fetch only

Review please: @othiym23 @bclinkinbeard
Yeah, that's why it's a separate commit :)