This reverts commit 37742ec520. Conflicts: requirements.txt Change-Id: I4b3749793e67b37c8a39f00a32e5d4e818fd04a1
37742ec520