CRM-12697

CRM-12697 (clean up)