I was thinking about doing this for CB, but it seems a major change in a unit's role/ability (even when it starts as none) might be too confusing. Also I didn't want to undermine buying the hatching which is cheaper in CB.
Still, I could be convinced.
