BACKPORT for issue 803

https://github.com/rcbops/chef-cookbooks/issues/803