Merge change 6764

* changes:
  Undo the changes accidentally merged from Donut