Remove vif_plugging workaround

Now that I1889662f74a8da8c4ccfc46f0ccf8e73e9acb74b
has merged this is no longer necessary.

Change-Id: Ifa92b39b2a9fd198234da7e9302bdce8f7d99029
Merge "Remove vif_plugging workaround"