rPHAB52329ae090310d4cbe1287da4fe57d435a49d143 got long ago superseded by upstream rPHAB9f11f310f87209e50c48a852312cd442d0c373b4 but nobody cleaned up our code.
In general I do not want such changes downstream as they have nothing to do specifically with our instance.