Should the ability to toggle Ranged/Melee on Troll Warlord be an innate ability?

I always thought being able to swap between melee and ranged should be something the hero could do from level 1 without having to skill Berserker's Range. It might not be as balanced (as it would give players option to pick Whirling Axes or even Fervor from level 1 and still allow Troll to contest rune/harass from afar using ranged attacks).

However from a design perspective, being able to swap between melee/ranged feels like something that is innate to the hero and isn't just caused by a regular spell to be skilled.

This would of course mean Rubick can no longer steal Berserkers Range to swap to melee form (not something you want to do on Rubick anyway lol - thought it is cool to whack people with your staff).