Revert "Types problem WIP"

This reverts commit 9d6f4086cb4943286deabfb875760248e5bbfa1a.