Can Jayce's Hammer form abilities not require mana? Nidalee and Elise's alternate forms cost no mana

I appreciate the recent Jayce buffs but they don't solve his original problem. His mana costs are very high, which is good for a champ with strong poke, but his hammer form mana costs are high too. You are forced to build manamune every game and even then you can easily run out of mana in teamfights. Removing the mana costs on his hammer form would still limit his long range poke and utility, but allow him options to fight in melee form, just like nidalee and elise.