Unreviewed, rolling out r212637.