Revert 8f45ffb..79c3d60

This rolls back to commit 8f45ffb4cdc0896fcc40c7e7e156d93bdd0de6c3.
Merge branch 'master' into rate-limiting