As @huonw mentioned above, #8215 is now fixed. This could be made non-pub too.