Unreviewed, rolling out r250114.