Restore missing code lines from the prior manual merge.