Revert "Have all configuration classes inherit from the new base class"

This reverts commit 7a8ba5c8acef2adfc2b3579570ad5a757a6473c8.