Bug 23805: Drop type lookup as it's now a foreign key