I am facing same problem for my public app ? Did you get any solution or migration is the only option?
Thanks, Pravin