See bug 568629 comment 78.
Created attachment 489259 [details] [diff] [review]
JST's patch from bug 568629
Blake: you already marked this r+ - just wanted to get this bug opened so things are more clear and organized
Landed, with a couple of comment tweaks:
*** Bug 334875 has been marked as a duplicate of this bug. ***