Merge change 5792 into donut

* changes:
  Fix typo introduced during variable cleanup.