Don't rely on labcontrol2001 quite yet.

Change-Id: I6c7be1f55236085f00ef692cc31d9a2750984253