Reverting autogen update in preference of build command line pre-processing.