Broken by eef53622 , and I've had enough
of tinderbox mails during the last week.

Change-Id: Iab0fe0363e8ca3212eb673ae1da9492140140bc3