use the actual api here
Merge branch 'master' into xs
stop storing metaclasses in the stash