Revert 6b456fa..2e5a8be

This rolls back to commit 6b456fad2127e9be0cf5c9f7a1fb4b68113b408e.
perf redis