This backward compatability code causes launching on VM for v6 and issue...

..., hence cleaning up