Revert "Fixes for scan in VD"