Merge pull request #9416 from nupplaphil/task/revert_guzzlehttp