Hi John,
Thanks for having another look at this!
[...]
I'll have to point out that the current proposed patch on bug #616544 [1]
is more subtle than you think in that it is not a plain revert. It already
does the right thing for the wip OLE2 DnD codepath :)
[...]
[1]
https://bugzilla.gnome.org/attachment.cgi?id=196999