Unreviewed, rolling out r241182.