Not for this PR but @craigh - I guess this has to be changed since we removed the D1 models right?