COOK-3032

http://tickets.opscode.com/browse/COOK-3032