diff --git a/stdlib/2/__builtin__.pyi b/stdlib/2/__builtin__.pyi
index 5a46deb80eda..35ecde070f54 100644
--- a/stdlib/2/__builtin__.pyi
+++ b/stdlib/2/__builtin__.pyi
@@ -351,17 +351,17 @@ class str(basestring, Sequence[str]):
     @overload
     def rpartition(self, sep: unicode) -> Tuple[unicode, unicode, unicode]: ...
     @overload
-    def rsplit(self, sep: Optional[str] = ..., maxsplit: int = ...) -> List[str]: ...
+    def rsplit(self, sep: None = ..., maxsplit: int = ...) -> List[str]: ...
     @overload
-    def rsplit(self, sep: unicode, maxsplit: int = ...) -> List[unicode]: ...
+    def rsplit(self, sep: AnyStr, maxsplit: int = ...) -> List[AnyStr]: ...
     @overload
     def rstrip(self, chars: str = ...) -> str: ...
     @overload
     def rstrip(self, chars: unicode) -> unicode: ...
     @overload
-    def split(self, sep: Optional[str] = ..., maxsplit: int = ...) -> List[str]: ...
+    def split(self, sep: None = ..., maxsplit: int = ...) -> List[str]: ...
     @overload
-    def split(self, sep: unicode, maxsplit: int = ...) -> List[unicode]: ...
+    def split(self, sep: AnyStr, maxsplit: int = ...) -> List[AnyStr]: ...
     def splitlines(self, keepends: bool = ...) -> List[str]: ...
     def startswith(self, prefix: Union[unicode, Tuple[unicode, ...]]) -> bool: ...
     @overload
diff --git a/stdlib/2/builtins.pyi b/stdlib/2/builtins.pyi
index 5a46deb80eda..35ecde070f54 100644
--- a/stdlib/2/builtins.pyi
+++ b/stdlib/2/builtins.pyi
@@ -351,17 +351,17 @@ class str(basestring, Sequence[str]):
     @overload
     def rpartition(self, sep: unicode) -> Tuple[unicode, unicode, unicode]: ...
     @overload
-    def rsplit(self, sep: Optional[str] = ..., maxsplit: int = ...) -> List[str]: ...
+    def rsplit(self, sep: None = ..., maxsplit: int = ...) -> List[str]: ...
     @overload
-    def rsplit(self, sep: unicode, maxsplit: int = ...) -> List[unicode]: ...
+    def rsplit(self, sep: AnyStr, maxsplit: int = ...) -> List[AnyStr]: ...
     @overload
     def rstrip(self, chars: str = ...) -> str: ...
     @overload
     def rstrip(self, chars: unicode) -> unicode: ...
     @overload
-    def split(self, sep: Optional[str] = ..., maxsplit: int = ...) -> List[str]: ...
+    def split(self, sep: None = ..., maxsplit: int = ...) -> List[str]: ...
     @overload
-    def split(self, sep: unicode, maxsplit: int = ...) -> List[unicode]: ...
+    def split(self, sep: AnyStr, maxsplit: int = ...) -> List[AnyStr]: ...
     def splitlines(self, keepends: bool = ...) -> List[str]: ...
     def startswith(self, prefix: Union[unicode, Tuple[unicode, ...]]) -> bool: ...
     @overload