Workaround for CHEF-3857