Revert some accidental changes to configure.ac