Remove NoVendor and NoOS, added in commit 123990, from Triple. While it