Unreviewed, rolling out r182247.