Bah! Partial revert of r38212. Unrelated file snuck into my commit window.