Please add a TODO with a reference to bug 1007148.