Backout 643194ceabe4, cfca520dc6f5, and cfca520dc6f5 (bug 855914) for MaxHeap regression.
Merge backout.