OHAI-412 was reverted on the 6-stable branch

The OHAI-412 changes are for Ohai 7.0.0+ and were accidentally merged to the
6-stable branch. They were reverted in these commits:

87042c00beb7e1563310d8d208a93216f89e5134
91edd2b8b7e7bd0c846efe773d131e98d4ed1229