Moving towards getting msdfs working again (this looks like it was broken