Make sure we use the right variable. Follow up r68848.