Back out stale autoconf modifications
Fix a mismerge
Remove out of date comment