Revert "fix clobered types"

This reverts commit 638db7ec2019dc8f74e4e5833c27f395815f7ffd.