Revert "Merge pull request #671 from edx/jarv/ansible-1.4"

This reverts commit 5c5b041f4a71edf89f46ca0b00bdc51db221dfff, reversing
changes made to 0553e0575717ab36de7e4c10a97bce3ac47232ec.
Merge pull request #677 from edx/revert-671

Revert "Merge pull request #671 from edx/jarv/ansible-1.4"