and on the upside, it looks like #5174 is repaired by it