Working on #777 for CKAN.