Merge pull request #2641 from Hixie/revert-bad-commit

Revert "Merge pull request #2639 from Hixie/always_specify_types"