Bug 904831 - Followup: clobber
merge m-c to fx-team