reverting zh_* changes