config: revert most changes made since version8c