make server.inc more robust

Summary: @jlreyes made this more robust, but I forgot to make him also change the import script to keep it. So when I did a re-import, it blew it up.

Reviewed By: @JoelMarcey

Differential Revision: D1549523