Fixes rcbops/chef-cookbooks#933.

Partial revert of 4f54e1b19371e8d1659a92714df78c53ecdda2f6.