Rework of r198404 to avoid changes in the build configuration.