Updated based on feedback from Opscode