PRD-4434:  fix for unit test failure

Incomplete port of fix from 3.9 caused unit test failure.