Fix variable selection due to ruby oddness

Change-Id: I20c98d56e36fa937bdd844c89a89c2d8e8359212