Fix problems with mdr performance.

@bug W-2051852@

@rev dchasman@
Merging origin/goliver/master-pending-mdr-perf-fix into master