Unreviewed, rolling out r125829.