Revert "Fix Remote Storage bug found upstream"
Merge pull request #38 from Kixeye/revert-37-0.9.x-remotenodenow2

Revert "Fix Remote Storage bug found upstream"