The previous fix from #17149 contained a thinko that produced errors for packages that overwrite configure_directory.