Unreviewed, rolling out r191902.