Bug 827836 - Back out some of cset 8bac87268303 because of an explosion in bug 823022 oranges. r=backout