Backed out changeset 52068b669c2a (bug 911209) for causing type errors in tests