Revert "Revert "Hg 69 use one api""
Merge pull request #121 from Wikia/revert-120-revert-111-HG-69-Use-one-api

Revert "Revert "Hg 69 use one api""