Unreviewed, rolling out r247493.