manually revert changes caused by different autoconf versions.