This required splitting the single patch file up, which was done with _some_ degree of accuracy (but not entirely so).