Backed out changeset 1bbc7f3de64c (bug 891884)
Merge m-c to birch