Unreviewed, rolling out r245418.