HAWelcome Restore the previous implementation due to unmet dependencies.
Merge branch 'release-157' of https://github.com/Wikia/app into release-157