Undid vain naming

Reviewers: campbellcolin42

Differential Revision: http://phabricator.localhost/D2