Unreviewed, rolling out r189136.