I think we should consider backing out the original patch instead of trying to fix it in situ. There is nova foxfooding happening right now so it might become a distraction.
Bug 2052706 Comment 2 Edit History
Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.
Can you back out the original patch instead of trying to fix it in situ. There is nova foxfooding happening right now so it might become a distraction.