Unreviewed, rolling out r207783.