Backed out changeset 197b12188f3a (bug 893973) for causing bug 9000007
Merge inbound to m-c
Merge m-c to inbound