Bug 982974 - Last bit of aurora fixup.  r=sfink, a=abillings