Reducing the number of locks for remote_storage.