TEZ-1479 addendum. Revert accidental change from previous commit.
(sseth)