XenVif #46
XenVif #46

Revert commit 3714613096b1bb7b7a76e9d360106ea19208f243
Revert commit 80ace57b353764c9165673e021c2a6cf7616a3bb
Re-fix issues uncovered by previous reversions

Signed-off-by: Ben Chalmers <b3747009c0bd3b0a8ac423a403e103e776512006@citrix.com>

kostaslamda/win-installer,xenserver/win-installer,cheng--zhang/win-installer,OwenSmith/win-installer,xenserver/win-installer,benchalmers/win-installer,cheng--zhang/win-installer,kostaslamda/win-installer,xenserver/win-installer,benchalmers/win-installer,kostaslamda/win-installer,OwenSmith/win-installer,kostaslamda/win-installer,xenserver/win-installer,cheng--zhang/win-installer,xenserver/win-installer,benchalmers/win-installer,benchalmers/win-installer,OwenSmith/win-installer,cheng--zhang/win-installer,OwenSmith/win-installer,cheng--zhang/win-installer,OwenSmith/win-installer,benchalmers/win-installer,kostaslamda/win-installer