Reverted to v160 to facilitate an easier pull request.