Work around CHEF-3493.