This reverts commit 802f291e. This large merge commit makes the typing of some polymorphic variables buggy.