Revert "more type fails"

This reverts commit a327636b74dd6f76d75852646774351fb723b104.