Revert "Merge branch '@tfountain:client-static-config' and Close #1360"

This reverts commit 0efc57e59696f1fd3b6cf3341374fd56a3194c12, reversing
changes made to 5c7a3747a0c7d833a8a64cf67b8bb6033dbfe890.