Revert r29049 because it is incorrectly overriding the results of an
AC config macro.