Fix incorrect variable

Also remove unused global.

Change-Id: Icb5f2d7fafdd0cb4fb8a5cf0fd9c6e9dc7b6c5ab
Remove support for Wikimedia Labs Messages

No longer in use or supported.

Change-Id: I676275540afdd06376a194fb2f955fc6fd945b96
Merge "Fix incorrect variable"
Merge "Remove support for Wikimedia Labs Messages"