am 22d41843: Fix the build, for real

* commit '22d418437e44587cb0fba4353515719453269189':
  Fix the build, for real