Bug 946813 - Part 0: Backout ef84114446cc (bug 941012) for breaking browser debugger. r=bustage

--HG--
extra : rebase_source : d2f9506adc15b5f72c0dda2fd4f28deabbf874ec