Merge change 6641 into donut

* changes:
  Unbreaking the build.