Revert "Merge branch 'opscode-master'"

This reverts commit 077a8aa49d4013974c07b534bf5c8e10887bd8eb, reversing
changes made to 25deee8feab184473beb4f737731c91b1e5cb333.