Unreviewed, rolling out r220463.