Settings - Outbound Mail fails with Fatal error: Class 'CRM_Core_BAO_ConfigSetting' not found

In my 4.1 install, I tried changing SMTP settings at civicrm/admin/setting/smtp?reset=1. When I saved I got:

Fatal error: Class 'CRM_Core_BAO_ConfigSetting' not found in /path/to/docs/sites/all/modules/civicrm/CRM/Admin/Form/Setting/Smtp.php on line 178

Call Stack:
0.0002 656760 1.

{main}

() /path/to/docs/index.php:0
0.8671 49629656 2. menu_execute_active_handler() /path/to/docs/index.php:21
0.8672 49630864 3. call_user_func_array() /path/to/docs/includes/menu.inc:517
0.8672 49631608 4. civicrm_invoke() /path/to/docs/includes/menu.inc:0
0.9602 63196072 5. CRM_Core_Invoke::invoke() /path/to/docs/sites/all/modules/civicrm/drupal/civicrm.module:454
1.0087 67731464 6. CRM_Utils_Wrapper->run() /path/to/docs/sites/all/modules/civicrm/CRM/Core/Invoke.php:199
1.0461 70878176 7. CRM_Core_Controller->run() /path/to/docs/sites/all/modules/civicrm/CRM/Utils/Wrapper.php:117
1.0464 70885512 8. HTML_QuickForm_Page->handle() /path/to/docs/sites/all/modules/civicrm/CRM/Core/Controller.php:284
1.0464 70885592 9. HTML_QuickForm_Controller->handle() /path/to/docs/sites/all/modules/civicrm/packages/HTML/QuickForm/Page.php:103
1.0465 70885592 10. CRM_Core_QuickForm_Action_Refresh->perform() /path/to/docs/sites/all/modules/civicrm/packages/HTML/QuickForm/Controller.php:203
1.0682 72398960 11. CRM_Core_Form->mainProcess() /path/to/docs/sites/all/modules/civicrm/CRM/Core/QuickForm/Action/Refresh.php:79
1.0682 72398960 12. CRM_Admin_Form_Setting_Smtp->postProcess() /path/to/docs/sites/all/modules/civicrm/CRM/Core/Form.php:254

Editing CRM/Admin/Form/Setting/Smtp.php and adding:

require_once("CRM/Core/BAO/ConfigSetting.php");

On line 178, right before:

CRM_Core_BAO_ConfigSetting::formatParams( $formValues, $mailingBackend );

Seems to fix the problem.