CRM-14399 this is probably safer & less like to wind up @colemanw than t...

...he prev version on this line