Revert "Update code to new version"

This reverts commit 9ab7bbf543004c3da3e8b621aecc6702327da7b3.