Stop-gap patch to fix race condition in remote_storage