Backout c49d5912c0de on a CLOSED TREE due to pushing the wrong version of the patch.