This 'mostly' reverts commit 2769098fe7. Conflicts: lib/ansible/utils/__init__.py test/units/TestUtils.py
2769098fe7