Revert "First try to fix types"

This reverts commit e346b69e05aed21625bed067e1e93c76481874af.