Fix https://tickets.opscode.com/browse/COOK-4241