This reverts commit 2c3cf62d4a. Causes build failures on x86_64, will respond to commit thread with link errors.
2c3cf62d4a