am 8bf89f30: (-s ours) Fix the build

* commit '8bf89f305eb3a2010b1a63048a4aa18ccbc42e78':
  Fix the build