Is this todo still to-done? Can we just open a bug on the appropriate repo?