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