This reverts commit 6bcfab3161ea3a90b26dce3f85ba052933060b73. Reverting because this breaks the build with MSVC
f18