Bug 982974 - Last bit of trunk fixup.  r=sfink

--HG--
extra : rebase_source : 5f7635125fca688cf315d21fd2aa9fe59f22baa1