From: Nil Geisweiller <[email-masked]>
Date: Wed, 14 Mar 2018 21:51:34 +0200

With a bit of tweaking I managed to apply the entire patch to HEAD and 
it works!!!

I get a similar result as yours, 40s with the patch, 10m without. A 
massive speed increase, and IMO completely acceptable given that 
commenting out that many lines is rather rare.

Thanks again!