#8215 is now fixed, is it possible to make this non-pub?