Those should land in LegacyBundle at some point I think