PRD-4434: Incomplete port of fix from 3.9