See summary.
Created attachment 106447 [details] Patch
Landed in r94607.
*** Bug 67585 has been marked as a duplicate of this bug. ***