Revert recent autoconf work