Revert previous change to YARR (bug 824856, r=sstangl).