Unreviewed, rolling out r247501.