Sean's changes extracted from https://github.com/Wikia/app/pull/2431

@SeanColombo, please test it and verify that these are the changes you intended to merge in  https://github.com/Wikia/app/pull/2431.