I like that we get rid of this incomprehensible regexp as a side effect of this patch!