This reverts commit ede34470, which
was apparently written based on testing performed before commits
1e15be1b and 9a12b6 were pushed upstream. Once those two patches are in
place, commit ede34470 is redundant, and can even cause
incorrect/unexpected behavior when auto-assigning addresses for
virtio-net devices.