Revert "Merge branch 'vhd' into vhd-nocopy"

This reverts commit 5474dd1d72700434c1d1df7611b62514ef2f901a, reversing
changes made to 37a88d2a2fe71e1cca795a96d130100129ed8af4.