Fix a silly scoping thing

Let's play the way the new kids play.

Change-Id: I6a62d8314118d6aee14c26b6036fe3a4f0bfe86e