Candidate fix for CHEF-3892

See CHEF ticket for full details on issue.