Unreviewed, rolling out r247123.