Backed out changesets c874a5812ba1 and 4ef90f0eecf2 (bug 886850) for build bustage. a=backout