Done even though GH doesn't collapse this outdated diff.