Partial revert of the commit of fc22bb87 It causes DLL loading failure on Windows. Reverting it for now until it's fixed in upstream wrapdb
cc @nirbheek