Perhaps this will make the mac tinderbox happy?

Change-Id: Ife277a44abf53c137eb8b9a727a3549ad57662cb