Backed out changesets 39500fdd5007 and cc22bc548566 (bug 890985) for B2G bustage.