Fix how we skip over requests incorrectly due to pips crappy regex

Change-Id: I0fad2a0f892d945842303a87a946cc70b604488a