committing the configure changes from #3112