Moving back to old fix for remote_store.