Reverted some VSS changes to the mainline version