Revert "Change the self def_id to a self_info in typeck, and inherit"

This reverts commit 921393c56886468b8f7476fa3a3e6ddb3bea421d.