Backed out changesets 5d245e2369fa and 8f3dad3b3698 (bug 949458) for suspicion of causing bug 960162.
Merge m-c to fx-team.