Backport from midgetspy. This is midgetspy@e76b3008251195ed529457f241d1e8803d9668d8

Change regex ignore more subs