Unreviewed, rolling out r244669.