I removed companyName for bug 935131 btw.