2c5b6859d9
This reverts commit a48b372b04.
Leaving only the part that fix device_multi.cpp
This reverts commit a48b372b04.
Leaving only the part that fix device_multi.cpp