Revert "Updates needed for new Configuration API"

This reverts commit 66214752d81f2e456c7ca4a224cc2ea3f63b9b2e.