TEZ-1479 addendum. Revert accidental change from previous commit.
(sseth)
(cherry picked from commit 71231c892deb40d4c7a0c9f948ea8d40ceb0ec6e)