experience units training barracks civ5 civ6

I really dislike how Civ6 does experienced units produced from cities with a 'bonus' to gained XP, but still green units. It'd be a lot nicer if Civ6's unit training was like Civ5, where newly trained units gain their promotions immediately. 1 for Barracks/Stables (with usual restrictions)...