Infra 272 better rate limit handling

Good idea!
aef763757cb6bc854d901067f4dc0d02605a8033