CRM-14399 this is probably safer & less like to wind up @colemanw than the prev version on this line