Refinement to commit #4993.