Unreviewed, rolling out r196791.