Revert "Redis fixups"

This reverts commit bc82ff8d6060fd703da2d2a8309a8ec53b2ff5f8.