Can we get a bug number to go with this TODO?