Remove the previous 'no_dad' workaround now that if_stf is fixed.
Partly revert b76e0baebb70775b192507ec18f523141800ce95.
(cherry picked from commit dad3885f9f5afbe0768387527122a885414dd3bc)
Remove the previous 'no_dad' workaround now that if_stf is fixed.
Partly revert b76e0baebb70775b192507ec18f523141800ce95.
(cherry picked from commit dad3885f9f5afbe0768387527122a885414dd3bc)