Does Fairy Godmother's potion plot undermine Shrek and Fiona's whole point?Discussion starter

She literally erases their choice to be together—turns Shrek human, Fiona 'proper'—and the film treats it as fixable rather than horrifying. Doesn't that betray the first film's message?