That fixes both sites where this is broken and sticks the shim on

BuildGraph

so we don't propagate ugly code