Removing Dir monkey patch.
Merge branch 'CHEF-4208'