Revert and reimplement regex capture fixes - #70