Unreviewed, rolling out r244495.