r17376: Fix bug #3985 - ensure in msdfs we check for our