diff --git a/mypy/fastparse.py b/mypy/fastparse.py
index 9a4562298270..26908b9ac399 100644
--- a/mypy/fastparse.py
+++ b/mypy/fastparse.py
@@ -398,7 +398,7 @@ def make_argument(arg: ast3.arg, default: Optional[ast3.expr], kind: int) -> Arg
                 if arg.annotation is not None:
                     arg_type = TypeConverter(self.errors, line=line).visit(arg.annotation)
                 elif arg.type_comment is not None:
-                    arg_type = parse_type_comment(arg.type_comment, arg.lineno, arg.col_offset)
+                    arg_type = parse_type_comment(arg.type_comment, arg.lineno, self.errors)
             return Argument(Var(arg.arg), arg_type, self.visit(default), kind)
 
         new_args = []
diff --git a/mypy/options.py b/mypy/options.py
index 5a8903286b22..d3057f5f221a 100644
--- a/mypy/options.py
+++ b/mypy/options.py
@@ -2,7 +2,7 @@
 import pprint
 import sys
 
-from typing import Any, Mapping, Optional, Tuple, List, Pattern
+from typing import Any, Mapping, Optional, Tuple, List, Pattern, Dict
 
 from mypy import defaults
 
diff --git a/mypy/semanal.py b/mypy/semanal.py
index 9a6a74993880..fe51d2e91476 100644
--- a/mypy/semanal.py
+++ b/mypy/semanal.py
@@ -253,6 +253,8 @@ def visit_file(self, file_node: MypyFile, fnam: str, options: Options) -> None:
 
         if self.cur_mod_id == 'builtins':
             remove_imported_names_from_symtable(self.globals, 'builtins')
+            for alias_name in ['List', 'Dict', 'Set']:
+                self.globals.pop(alias_name, None)
 
         if '__all__' in self.globals:
             for name, g in self.globals.items():
diff --git a/mypy/test/testgraph.py b/mypy/test/testgraph.py
index d88ca1c41b1e..7a9062914f89 100644
--- a/mypy/test/testgraph.py
+++ b/mypy/test/testgraph.py
@@ -1,6 +1,6 @@
 """Test cases for graph processing code in build.py."""
 
-from typing import AbstractSet, Dict, Set
+from typing import AbstractSet, Dict, Set, List
 
 from mypy.myunit import Suite, assert_equal
 from mypy.build import BuildManager, State, BuildSourceSet
diff --git a/mypy/typevars.py b/mypy/typevars.py
index 1bdb1049ebed..6b3e41912163 100644
--- a/mypy/typevars.py
+++ b/mypy/typevars.py
@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Union, List
 
 from mypy.nodes import TypeInfo
 
diff --git a/test-data/samples/crawl.py b/test-data/samples/crawl.py
index f33e6258d075..8c3ff157822a 100644
--- a/test-data/samples/crawl.py
+++ b/test-data/samples/crawl.py
@@ -16,7 +16,7 @@
 import sys
 import time
 import urllib.parse
-from typing import Any, Generator, IO, Optional, Sequence, Set, Tuple
+from typing import Any, Generator, IO, Optional, Sequence, Set, Tuple, List, Dict
 
 
 ARGS = argparse.ArgumentParser(description="Web crawler")
diff --git a/test-data/samples/crawl2.py b/test-data/samples/crawl2.py
index 5eaad70cc14a..fae5bc0b751b 100644
--- a/test-data/samples/crawl2.py
+++ b/test-data/samples/crawl2.py
@@ -17,7 +17,7 @@
 import sys
 import time
 import urllib.parse
-from typing import Any, Awaitable, IO, Optional, Sequence, Set, Tuple
+from typing import Any, Awaitable, IO, Optional, Sequence, Set, Tuple, List, Dict
 
 
 ARGS = argparse.ArgumentParser(description="Web crawler")
diff --git a/test-data/unit/pythoneval.test b/test-data/unit/pythoneval.test
index 7945fe552114..ffc0dbd1a43a 100644
--- a/test-data/unit/pythoneval.test
+++ b/test-data/unit/pythoneval.test
@@ -1147,7 +1147,7 @@ print(b.x + 1)
 4
 
 [case testInferenceWithLambda]
-from typing import TypeVar, Iterable, Iterator
+from typing import TypeVar, Iterable, Iterator, List
 import itertools
 
 _T = TypeVar('_T')
diff --git a/typeshed b/typeshed
index a778704b3047..22c03534983b 160000
--- a/typeshed
+++ b/typeshed
@@ -1 +1 @@
-Subproject commit a778704b30475dacd4d088fdcbcc60378e152979
+Subproject commit 22c03534983bde1bd39e6437ffde149af993df7f