Restore DragonFly change, lost in Friday's update. PR 47586