Revert some changes in autogen.sh