This reverts commit 26fa17ed2914bd80c066d36b325fd3104e45554c. This reverts commit 4403c4f9e77e673a2771edfc7ab0ebb234e97485. There is still an ODR issue causing linker errors, investigating.
This reverts commit 26fa17ed2914bd80c066d36b325fd3104e45554c. This reverts commit 4403c4f9e77e673a2771edfc7ab0ebb234e97485. There is still an ODR issue causing linker errors, investigating.