Revert "Fix for potential null pointer exception in config."

This reverts commit 18def8555d5ad3f5e081ff58f7423fecff277977.