restore lazy_match from previous commit