Backport more Redis/Sidekiq stuff