Work around for hard coded flavor
Merge pull request #138 from AndrewFly/server_hard_coded_flavors

Work around for hard coded flavor.