Revert changes from TEZ-1783