Revert "Merge upstream changes"
Merge pull request #2 from YourStory/revert-1-master

Revert "Merge upstream changes"