Don't increase N_TOKENS.
Closes #571
diff --git a/CHANGELOG b/CHANGELOG
index b6782a3..e845388 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
# All notable changes to this project will be documented in this file.
# This project adheres to [Semantic Versioning](http://semver.org/).
+## [0.22.1] UNRELEASED
+### Fixed
+- There's no need to increase N_TOKENS. In fact, it causes other things which
+ use lib2to3 to fail if called from YAPF.
+
## [0.22.0] 2018-05-15
### Added
- The `BLANK_LINE_BEFORE_MODULE_DOCSTRING` knob adds a blank line before a
diff --git a/yapf/yapflib/format_token.py b/yapf/yapflib/format_token.py
index 4530cb8..ef04e4e 100644
--- a/yapf/yapflib/format_token.py
+++ b/yapf/yapflib/format_token.py
@@ -26,7 +26,6 @@
from yapf.yapflib import style
CONTINUATION = token.N_TOKENS
-token.N_TOKENS += 1
class Subtype(object):
