Revert "#560 - Fix server config validation issues."

This reverts commit dfc8668bb1caf8cd897ee673990d4db1833be7b6.

Went into previous commit relating to fixing a test, by mistake.