Partially revert d9d80783, results should never have been changed
Increase limit of regexp to fix unit tests