If you want to fix it in this PR that'd be easier, otherwise we'll create conflicting pulls, and it's only a two-line change.