Revert
Merge pull request #492 from guardian/clicktrap

Revert: common fn for rate limiting