Unreviewed, rolling out r167700.