changes made while fixing 976561 in the pulp repo