Bug 1094286 - Undo Gum specific changes; r=past,catlee