Backout f7814e2bc3dd
Backout e090321a025c
Backout cb37a2ae805f on a CLOSED TREE