[CHEF-3029] Added some lines that have disappeared in the rebase

http://tickets.opscode.com/browse/CHEF-3029

Origina PR: https://github.com/opscode/chef/pull/712