we'll handle this with https://wikia-inc.atlassian.net/browse/VID-1316, so it's not a blocker for this PR.