Registrable classes already handled their own instancing, changes to enable instancing everywhere conflicted.