Addressed: https://phabricator.ushahidi.com/D2