Make the caller responsible to know whether the rate-limit code should
be called or not

(cherry picked from commit 7f89a297)