The cooldown will always be five, so after 3 turns the original skill will come back with a remaining cooldown of 2?

I have the feeling the problem of this bug is. During fight is the skill bar locked, you can't ad skills and therefore the polymorph skill can't add them aswell. This breaks the skills a the bug remains after fight, until reload. At least that is my impression.

Or make both skills always available but Bull rush is greyed out as long Bull horns is not used?