Merge change 2637 into donut

* changes:
  Revert "Bug fixes and performance improvements"