Revert all changes based on a diff.
Merge pull request #984 from Wikia/revert-pull-request-870

Revert all changes based on a diff.