Unreviewed, rolling out r228431.