CRM-19273 very minor extraction