Backout 3011b2b7f82f (bug 966384) for unused variable failures. r=backout

CLOSED TREE

--HG--
extra : amend_source : dfb81e133bca73ba3c5ad959593c5d3d444f8506