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