not really :)

BTW this PR is based on https://github.com/Wikia/app/pull/3315 so I'll fix it there and rebase this branch