Restored another previous fix clobbered by a merge.