GEOT-4404: reverted changes to Configuration objects