Revert accidental merge of WIP config freeze change.

/headdesk
Release 2.0.6.