This is code that existed before. I just moved it around. If there was no error before, we should just leave it. When I initially did this I remember an issue. I'm not sure if I can reproduce it but it was along the following lines:
- If you make a service call, the service client automatically enters the YML default (0 in this case)
- If you set an explicit value (other than 0) it will be used
- The meaning of -1 is no limit
- The meaning of 0 is apply the container defined limit

I think we are good and this can be mergee