Revert "Exploring fixes to type performance"

This reverts commit 387dfcaf18e91ab20fbfb2c69a3b24bcdff36c88.