Unreviewed, rolling out r207557.