Cherry-picking regex fix.