Applies patch opscode/omnibus#367