Backout 184ef886365d, 4c6a6ac3a9d5, and 59857a435c3b on a CLOSED TREE