am 5238c5f9: fix the build.  will revisit this change in a minute

Merge commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c'

* commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c':
  fix the build.  will revisit this change in a minute