Unreviewed, rolling out r244228.