Merge change 24968 into eclair

* changes:
  Minor perf tweak for fountain.