Infra 272 better rate limit handling

IDK. good catch though. ad93b94