clean up after Sean's r127646 patch.