Revert "Fix type id"

This reverts commit 8f1ce31035cb98e2c31db2ae4cddb1e4c6169063.