Re-remove auto type assignment

I didn't do a good job on the implementation and didn't allow it to bake or have tests before tagging. A lesson for next time. I will do a more thorough review before attempting another release.