D 16618 Switches Rate limiting to using the new patch support

Don't pull in until the patch story has been brought in and i have the chance to rebase.