Unreviewed, rolling out r170605.