Merge branch 'devel' of git://github.com/ansible/ansible into upstream
Revert "Merge branch 'devel' of git://github.com/ansible/ansible into upstream"

This reverts commit a665763b7ac34f188f783ed5fce581b3209ec4bc, reversing
changes made to 84ee05a3c0d7921da9489a2ddeda1644b7faa4d9.
Merge branch 'upstream' into devel