Unreviewed, rolling out r241612.