rollback redis.rb into official master version