Unreviewed, rolling out r176566.