CRM-16701 - previous fix in result_cleanup was not sufficient.