Backporting upstream change from https://github.com/chef/omnibus/commit/fa31aa041a71071ca85fb4719288d439de7463a6