Done. If only GH would consider this an outdated diff.