Reset the tree to match d88121ba8f8282222c8e4d22589b65a7010a5710 (Dec. 2, 2014)