Removing the default POP Mail Server on OnDemand misconfigures Mail Handlers

Removing the default POP Mail Server on OnDemand changes the configuration of every Mail Handler using that Server to "Local Files"

Even after a restart of the OnDemand instance, where the default Mail Server and Mail Handlers are reset back to their original state, all the Mail Handlers that used to be configured to use the "POP Mail Server" will still be pointing to use "Local Files".

"Local Files" is an option that is not available on OnDemand so new incoming emails won't be processed.

Steps to reproduce:

1. Create a Mail Handler that uses the default POP Mail Server
2. Remove the POP Mail Server
3. Notice how the Mail Handler Server option changed to "Local Files"
4. Restart the instance
5. Notice how the POP Mail Server was restored but the Mail Handler still points incorrectly to "Local Files"

Image attached shows how one can only select POP Mail Server but still the Server of the Mail Handler points to "Local Files"

Workaround:
Edit every Mail Handler, set the Server, save changes.
Emails that weren't processed during the period, will now be processed.