HPCC-9906 "Take Two"

Signed-off-by: jamienoss <james.noss@lexisnexis.com>