CRM-13550 honestly I think I have it this time

hopefully I've finally done it right