SI-7132 - don't discard Unit type in interpreter

backport from previous pull request #2191. review @paulp