Bug 1066591. Backout c43865439dd9 (bug 1066211) to fix regression.

--HG--
extra : rebase_source : bd821aade3b17d7eb4cd6acb5f56b46a343eb239