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