Backed out changeset 1bbc7f3de64c (bug 891884)
merge m-c to fx-team