This reverts commit 4abf0b3193. Changes are reverted because they break build of proxy dlls on Windows
4abf0b3193