Note: Autoconf files must be cleaned up and regenerated to ensure proper compilation.
This reverts commit 7fd19f29ba.
7fd19f29ba
Broken for now. Committing so I can switch computers.