Revert "Merge pull request #175 from opscode/adamed-oc-9106"

This reverts commit f1dd92a10aefce1ca316c98937fd62dfba3c62d8, reversing
changes made to dfe0051098fbd3b6f37869db2040877422eb07e3. This commit unintentionally pulled in changes from the master branch.
Merge pull request #204 from opscode/adamed-6-stable-revert

Revert unintentional changes from master